3.3 *Stability fixes